samll fix for invisible columns

Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>

        * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
        columns

diff --git a/ChangeLog b/ChangeLog
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fec3e3822cba7ff1cc2574f49029ac339eacb251..4d4c49df17cfe4c07f35a044b857febbf5e4dad7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Oct 22 16:22:55 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible
+       columns
+
 Thu Oct 22 02:29:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfilesel.h: GtkType and macro fixups

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 6e048f4ad6f7b8d629c069faf22e7e2acb8dd957..25a85e6c57f89ca10affed7005c328cc065d5f54 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -71,13 +71,14 @@ COLUMN_FROM_XPIXEL (GtkCList * clist,
   gint i, cx;
 
   for (i = 0; i < clist->columns; i++)
-    {
-      cx = clist->column[i].area.x + clist->hoffset;
+    if (clist->column[i].visible)
+      {
+       cx = clist->column[i].area.x + clist->hoffset;
 
-      if (x >= (cx - (COLUMN_INSET + CELL_SPACING)) &&
-         x <= (cx + clist->column[i].area.width + COLUMN_INSET))
-       return i;
-    }
+       if (x >= (cx - (COLUMN_INSET + CELL_SPACING)) &&
+           x <= (cx + clist->column[i].area.width + COLUMN_INSET))
+         return i;
+      }
 
   /* no match */
   return -1;